Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 21:27:41 +0000 (13:27 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 21:27:41 +0000 (13:27 -0800)
commitd83b3622a2f3d9c5b9086c6ed9c05efb813a272a
treeabb86501ec6229c2d314bac79b3fa42d1911115c
parent4b8111ebb92f1415adfa35963d2711cf30bf8cf6
parent79d01ccb5595749bebe9dd2dc10d7cf6cc32ea43
Merge from mainline.